Can you please resolve the conflicts?

Can you please resolve the conflicts?

This is a request to rebase / force push your branch, rather than merging it. So this goes directly to the upstream MR OSSystems#920

Please review and rebase your branch with this one, so the upstream MR gets updated for final submission.

Ah I see, didn't see your previous message. I'll sort that out manually.

@caneraltinbasak how are things going? do you see any chance we move forward with this? Don't wanna bother you at all if things are busy atm, just wanna see this work you've done getting merged at some point :-) Anyway, let me know if there's anything I can do from my side to push forward as well. Thanks

@caneraltinbasak how are things going? do you see any chance we move forward with this? Don't wanna bother you at all if things are busy atm, just wanna see this work you've done getting merged at some point :-) Anyway, let me know if there's anything I can do from my side to push forward as well. Thanks

I finally had some time to move things forward. Sorry for the delay. You can close this pull request if you are happy with the updated pull requests to OSSystems/meta-browser OSSystems#920

@caneraltinbasak how are things going? do you see any chance we move forward with this? Don't wanna bother you at all if things are busy atm, just wanna see this work you've done getting merged at some point :-) Anyway, let me know if there's anything I can do from my side to push forward as well. Thanks

I finally had some time to move things forward. Sorry for the delay. You can close this pull request if you are happy with the updated pull requests to OSSystems/meta-browser OSSystems#920

Thanks! Almost fully agreed on the differences, just a few comments:

• can we (or shall we) keep the revision hashes on README, instead of just HEAD? As the build constantly fails, i'd just stick to the tested hashes in the README.
• we shouldn't be using numbered patches, e.g. having the patch subject as [PATCH 01/11] doesn't really make sense.
• better have patches without the git signature at the bottom, please run format-patch with --no-signature
• I'd keep the following patch as 0013* , to be incremental in the patch numbering ./meta-chromium/recipes-browser/chromium/files/0019-Reduce-minimum-browser-window-width-to-480px.patch. But also, you've dropped the patch from the SRC_URI , but kept the file.

@caneraltinbasak how are things going? do you see any chance we move forward with this? Don't wanna bother you at all if things are busy atm, just wanna see this work you've done getting merged at some point :-) Anyway, let me know if there's anything I can do from my side to push forward as well. Thanks

I finally had some time to move things forward. Sorry for the delay. You can close this pull request if you are happy with the updated pull requests to OSSystems/meta-browser OSSystems#920

Thanks! Almost fully agreed on the differences, just a few comments:

* can we (or shall we) keep the revision hashes on README, instead of just HEAD? As the build constantly fails, i'd just stick to the tested hashes in the README.

* we shouldn't be using numbered patches, e.g. having the patch subject as `[PATCH 01/11]` doesn't really make sense.

* better have patches without the git signature at the bottom, please run format-patch with --no-signature

* I'd keep the following patch as 0013* , to be incremental in the patch numbering `./meta-chromium/recipes-browser/chromium/files/0019-Reduce-minimum-browser-window-width-to-480px.patch`. But also, you've dropped the patch from the SRC_URI , but kept the file.

Regarding the commit log, is there a reason why you wanna stick to your former commit log without updating it?
Anyway, here's what should be fixed:

• wrap commit log to 80-column width
• fix chromium release number
• fix missing patches in the added/updated/removed lists
• use the same items formatting from the previous commits

Adding the signed-off-by is optional, as I'm not sure about the community rules in this layer. Anyway, that's up to you, I'm fine either way :-) - but the above items should be fixed for the final submission, and that's basically what I've pushed into my branch.

I assumed you only did a rebase. Now I've overwritten my branch with your changes.

I assumed you only did a rebase. Now I've overwritten my branch with your changes.

Yep, a rebase indeed. Thanks a lot, and good work.